From 7e0844d92f10e0ef328fb79e98451e6eef92c606 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 11 Dec 2017 00:59:14 +0100 Subject: [PATCH] dnd: No point in determining the keyboard We only use the pointer. --- gtk/gtkdnd.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index e969a3702c..4eef1f2188 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1058,12 +1058,11 @@ gtk_drag_begin_internal (GtkWidget *widget, GdkDragAction possible_actions, suggested_action; GdkDragContext *context; GtkWidget *ipc_widget; - GdkDevice *pointer, *keyboard; + GdkDevice *pointer; GdkWindow *ipc_window; int dx, dy; GdkAtom selection; - pointer = keyboard = NULL; ipc_widget = gtk_drag_get_ipc_widget (widget); gtk_drag_get_event_actions (event, button, actions, @@ -1078,12 +1077,7 @@ gtk_drag_begin_internal (GtkWidget *widget, pointer = gdk_event_get_device (event); if (gdk_device_get_source (pointer) == GDK_SOURCE_KEYBOARD) - { - keyboard = pointer; - pointer = gdk_device_get_associated_device (keyboard); - } - else - keyboard = gdk_device_get_associated_device (pointer); + pointer = gdk_device_get_associated_device (pointer); } else { @@ -1091,7 +1085,6 @@ gtk_drag_begin_internal (GtkWidget *widget, seat = gdk_display_get_default_seat (gtk_widget_get_display (widget)); pointer = gdk_seat_get_pointer (seat); - keyboard = gdk_seat_get_keyboard (seat); } if (!pointer) -- 2.30.2